Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACT-688 Renamed beneficiary model to Individual #330

Merged
merged 11 commits into from
Apr 9, 2020
Merged

ACT-688 Renamed beneficiary model to Individual #330

merged 11 commits into from
Apr 9, 2020

Conversation

nasirhjafri
Copy link
Collaborator

What is the Purpose?

Briefly describe what the PR addresses

What was the approach?

Briefly describe the approach used to address the issue

Are there any concerns to addressed further before or after merging this PR?

State some additional info if any. For instance running install or setting some environment variable(s)

Mentions?

Mention persons you'd like to review this PR

Issue(s) affected?

List of issues addressed by this PR.

@codecov-io
Copy link

codecov-io commented Mar 31, 2020

Codecov Report

Merging #330 into dev will increase coverage by 0.05%.
The diff coverage is 63.21%.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev     #330      +/-   ##
==========================================
+ Coverage   50.37%   50.42%   +0.05%     
==========================================
  Files         101      103       +2     
  Lines        8320     8329       +9     
==========================================
+ Hits         4191     4200       +9     
  Misses       4129     4129              
Impacted Files Coverage Δ
activity/views.py 19.83% <ø> (ø)
formlibrary/urls.py 100.00% <ø> (ø)
workflow/filters.py 87.50% <ø> (ø)
workflow/forms.py 36.19% <ø> (ø)
formlibrary/views.py 33.86% <37.50%> (ø)
formlibrary/forms.py 40.84% <42.85%> (ø)
customdashboard/views.py 9.37% <50.00%> (ø)
formlibrary/models.py 93.69% <71.42%> (ø)
formlibrary/admin.py 100.00% <100.00%> (ø)
formlibrary/migrations/0003_auto_20200409_0727.py 100.00% <100.00%> (ø)
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 54c7409...77692bc. Read the comment docs.

@nasirhjafri nasirhjafri changed the title [WIP] ACT-688 Renamed beneficiary model to Individual ACT-688 Renamed beneficiary model to Individual Apr 3, 2020
@andrewtpham
Copy link
Member

@Kimaiyo077 can you kindly review this when you have time? Thanks!

@ninetteadhikari ninetteadhikari linked an issue Apr 5, 2020 that may be closed by this pull request
@andrewtpham andrewtpham added this to the Sprint 33 milestone Apr 6, 2020
@andrewtpham andrewtpham added 3 Not so complex, requiring a relatively good amount of effort and time to fix refactor Time to restructure some code! labels Apr 6, 2020
Copy link
Collaborator

@Kimaiyo077 Kimaiyo077 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nasirhjafri Please fix failing tests, The migrations are the issue here.

@nasirhjafri
Copy link
Collaborator Author

@nasirhjafri Please fix failing tests, The migrations are the issue here.

done!

@andrewtpham
Copy link
Member

@nasirhjafri it looks like we nee dto run migrations again, the tests are failing python manage.py makemigrations --merge

@Kimaiyo077
Copy link
Collaborator

Hey @nasirhjafri, Nice work on the changes you made and ensuring everything is as before. I, however, have found one issue. When I try to change the Individuals label to my own organization label, I am unable to save it. To reproduce the error go to organization settings, under configurations labels you will find form library labels and try to update any.
error4

@andrewtpham
Copy link
Member

andrewtpham commented Apr 9, 2020

Hey @nasirhjafri, Nice work on the changes you made and ensuring everything is as before. I, however, have found one issue. When I try to change the Individuals label to my own organization label, I am unable to save it. To reproduce the error go to organization settings, under configurations labels you will find form library labels and try to update any.
error4

@nasirhjafri @Kimaiyo077 Do we know if the Individual label was configured to update across the application? I cant recall if this was done previously. Copying @IvyMMutiso in case she recalls since she did most of these label configurations. If it was not, I can create this issue as a separate card and handle it there.

@Kimaiyo077
Copy link
Collaborator

Hey @nasirhjafri, Nice work on the changes you made and ensuring everything is as before. I, however, have found one issue. When I try to change the Individuals label to my own organization label, I am unable to save it. To reproduce the error go to organization settings, under configurations labels you will find form library labels and try to update any.
error4

@nasirhjafri @Kimaiyo077 Do we know if the Individual label was configured to update across the application? I cant recall if this was done previously. Copying @IvyMMutiso in case she recalls since she did most of these label configurations. If it was not, I can create this issue as a separate card and handle it there.

If I remember correctly, It was done before and I could change the labels for the form library components. I, however, would suggest that this issue be moved to a separate card seeing as this one is already large enough. This one issue can be fixed in a new ticket

@andrewtpham
Copy link
Member

Hi @nasirhjafri I faced this issue when I tried to edit an individual record by either clicking on the individual's name I created OR click more > Edit
Here is the error I received:
image

@Kimaiyo077 did you receive this when you tested?

andrewtpham
andrewtpham previously approved these changes Apr 9, 2020
Copy link
Member

@andrewtpham andrewtpham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ability to edit an Individual record is now working. Thanks @nasirhjafri

Copy link
Member

@andrewtpham andrewtpham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, migrations are now fixed!

@andrewtpham andrewtpham merged commit fabec82 into dev Apr 9, 2020
@andrewtpham andrewtpham deleted the ACT-688 branch April 9, 2020 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 Not so complex, requiring a relatively good amount of effort and time to fix refactor Time to restructure some code!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ACT-688 Rename Beneficiary model "Individual"
4 participants